Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set

When CONFIG_ZERO_BOOTDELAY_CHECK is not defined, bootdelay==0
prevents the check for console input (as stated in README.autoboot).
This must also work in CONFIG_AUTOBOOT_KEYED mode.

Signed-off-by: Dirk Eibach <[email protected]>

diff --git a/common/main.c b/common/main.c
index 94059225735d20c4cd885af85020d1eacdd126ae..81984acb000f0c191cddaa576d52977f838fbf8d 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -114,6 +114,11 @@ int abortboot(int bootdelay)
        u_int presskey_max = 0;
        u_int i;
 
+#ifndef CONFIG_ZERO_BOOTDELAY_CHECK
+       if (bootdelay == 0)
+               return 0;
+#endif
+
 #  ifdef CONFIG_AUTOBOOT_PROMPT
        printf(CONFIG_AUTOBOOT_PROMPT);
 #  endif